From d5ae80a5370fbf6bb78b9c75f6f6c6f5b87a61c0 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 17 Nov 2006 12:13:24 +0000 Subject: [PATCH] [XEN] Fix build. Mercurial ate my changeset fixups. :-( Signed-off-by: Keir Fraser --- xen/common/grant_table.c | 6 +++--- xen/include/xen/iocap.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 552db91089..c499c8a447 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -994,7 +994,7 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(map, count)) ) goto out; rc = -EPERM; - if ( unlikely(!grant_flip_permitted(d)) ) + if ( unlikely(!grant_operation_permitted(d)) ) goto out; rc = gnttab_map_grant_ref(map, count); break; @@ -1006,7 +1006,7 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(unmap, count)) ) goto out; rc = -EPERM; - if ( unlikely(!grant_flip_permitted(d)) ) + if ( unlikely(!grant_operation_permitted(d)) ) goto out; rc = gnttab_unmap_grant_ref(unmap, count); break; @@ -1024,7 +1024,7 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(transfer, count)) ) goto out; rc = -EPERM; - if ( unlikely(!grant_flip_permitted(d)) ) + if ( unlikely(!grant_operation_permitted(d)) ) goto out; rc = gnttab_transfer(transfer, count); break; diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h index b3a5daec45..77c06f2517 100644 --- a/xen/include/xen/iocap.h +++ b/xen/include/xen/iocap.h @@ -36,7 +36,7 @@ * domains with no hardware-access privileges to perform grant map/transfer * operations. */ -#define grant_operations_permitted(d) \ +#define grant_operation_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) #endif /* __XEN_IOCAP_H__ */ -- 2.30.2